Remove unused cet_vprintf. Change cet_fprintf to cet_gbfprintf with paramter 'gbfile'.

diff --git a/gpsbabel/cet_util.c b/gpsbabel/cet_util.c
index 5565ff22a8d7450c9fb37fa2633f98801524b977..956d5e6f05a3301ef5341cacd4b535f6378f886c 100644 (file)
--- a/gpsbabel/cet_util.c
+++ b/gpsbabel/cet_util.c
@@ -1102,55 +1102,44 @@ cet_disp_character_set_names(FILE *fout)
  *
  * - print any special hard-coded characters from inside a module - */
 
-int cet_vfprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, va_list args)
+int cet_gbfprintf(gbfile *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...)
 {
        char buff[128];
-       char *cout = buff;
        int res, ct;
-       va_list args2;          /* vsnprintf makes args unusable for a second try */
-       
-       __va_copy(args2, args);
+       va_list args;
+       char *cout = buff;
+
+       va_start(args, fmt);
        ct = vsnprintf(buff, sizeof(buff), fmt, args);
+       va_end(args);
+
        if (ct >= (int)sizeof(buff)) {
-           cout = xmalloc(ct + 1);
-           vsnprintf(cout, ct + 1, fmt, args2);
+               cout = xmalloc(ct + 1);
+               va_start(args, fmt);
+               vsnprintf(cout, ct + 1, fmt, args);
+               va_end(args);
        }
-       va_end(args2);
-       
+
        if (global_opts.charset != src_vec)
        {
-           if (src_vec != &cet_cs_vec_utf8)
-           {
-               char *ctemp = cet_str_any_to_utf8(cout, src_vec);
-               if (cout != buff) xfree(cout);
-               cout = ctemp;
-           }
-           if (global_opts.charset != &cet_cs_vec_utf8)
-           {
-               char *ctemp = cet_str_utf8_to_any(cout, global_opts.charset);
-               if (cout != buff) xfree(cout);
-               cout = ctemp;
-           }
+               if (src_vec != &cet_cs_vec_utf8) {
+                       char *ctemp = cet_str_any_to_utf8(cout, src_vec);
+                       if (cout != buff) xfree(cout);
+                       cout = ctemp;
+               }
+               if (global_opts.charset != &cet_cs_vec_utf8) {
+                       char *ctemp = cet_str_utf8_to_any(cout, global_opts.charset);
+                       if (cout != buff) xfree(cout);
+                       cout = ctemp;
+               }
        }
 
-       res = fprintf(stream, "%s", cout);
+       res = gbfprintf(stream, "%s", cout);
        if (cout != buff) xfree(cout);
        
        return res;
 }
 
-int cet_fprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...)
-{
-       int res;
-       va_list args;
-       
-       va_start(args, fmt);
-       res = cet_vfprintf(stream, src_vec, fmt, args);
-       va_end(args);
-       
-       return res;
-}
-
 /*
  * 'str'  points to an array of XML_Chars which may be UNICODE16
  * words in native endianness.

diff --git a/gpsbabel/cet_util.h b/gpsbabel/cet_util.h
index 96febcd884d1ec62307829d450622caf0469da0c..998c83ef05db256142f69505aa01cd532d8df8a3 100644 (file)
--- a/gpsbabel/cet_util.h
+++ b/gpsbabel/cet_util.h
@@ -99,8 +99,7 @@ char *cet_str_uni_to_any(const short *src, int length, const cet_cs_vec_t *dest_
 char *cet_str_any_to_any(const char *src, const cet_cs_vec_t *src_vec, const cet_cs_vec_t *dest_vec);
 int cet_valid_char(const char *src, const cet_cs_vec_t *vec);
 
-int cet_vfprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, va_list args);
-int cet_fprintf(FILE *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...);
+int cet_gbfprintf(gbfile *stream, const cet_cs_vec_t *src_vec, const char *fmt, ...);
 
 /* cet_convert_string: !!! ONLY VALID WITHIN 'cet_convert_strings' process !!! */
 char *cet_convert_string(char *str);